projects / gpsbabel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 129cbf6 cbaa069)
Merge pull request #143 from gpsbabel/fix_bad_merge
authorGPSBabel <gpsbabel@users.noreply.github.com>
Wed, 6 Dec 2017 22:29:19 +0000 (16:29 -0600)
committerGitHub <noreply@github.com>
Wed, 6 Dec 2017 22:29:19 +0000 (16:29 -0600)
Fix a bad merge base in PR 126. Only main.cc seems to be affected.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.